Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'dev' into experimental #1148

Merged
merged 26 commits into from
Jul 22, 2024
Merged

Merge branch 'dev' into experimental #1148

merged 26 commits into from
Jul 22, 2024

Conversation

tqn
Copy link
Contributor

@tqn tqn commented Jul 22, 2024 •
edited
Loading

In addition to the merge, we update the Cargo.toml of recursion/core-v2 to match that of recursion/core.

Result of git diff --no-ext-diff tqn/merge-dev-into-experimental -R after running git merge dev on experimental:

diff --git b/Cargo.lock a/Cargo.lock
index b40b55ea..fbbf78ca 100644
--- b/Cargo.lock
+++ a/Cargo.lock
@@ -4904,7 +4904,7 @@ dependencies = [
  "sp1-recursion-derive",
  "sp1-recursion-gnark-ffi",
  "sp1-recursion-program",
- "zkhash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zkhash",
 ]
 
 [[package]]
@@ -4968,18 +4968,19 @@ dependencies = [
  "sp1-primitives",
  "static_assertions",
  "tracing",
- "zkhash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zkhash",
 ]
 
 [[package]]
 name = "sp1-recursion-core-v2"
-version = "0.0.2-test"
+version = "1.0.0-rc.1"
 dependencies = [
  "arrayref",
  "backtrace",
  "ff 0.13.0",
  "hashbrown 0.14.5",
  "itertools 0.13.0",
+ "num_cpus",
  "p3-air",
  "p3-baby-bear",
  "p3-bn254-fr",
@@ -4993,7 +4994,6 @@ dependencies = [
  "p3-merkle-tree",
  "p3-poseidon2",
  "p3-symmetric",
- "p3-uni-stark",
  "p3-util",
  "rand",
  "serde",
@@ -5004,7 +5004,7 @@ dependencies = [
  "sp1-recursion-core",
  "static_assertions",
  "tracing",
- "zkhash 0.2.0 (git+https://github.com/HorizenLabs/poseidon2)",
+ "zkhash",
 ]
 
 [[package]]
@@ -6317,29 +6317,3 @@ dependencies = [
  "sha3",
  "subtle",
 ]
-
-[[package]]
-name = "zkhash"
-version = "0.2.0"
-source = "git+https://github.com/HorizenLabs/poseidon2#bb476b9ca38198cf5092487283c8b8c5d4317c4e"
-dependencies = [
- "ark-ff 0.4.2",
- "ark-std 0.4.0",
- "bitvec",
- "blake2",
- "bls12_381",
- "byteorder",
- "cfg-if",
- "group 0.12.1",
- "group 0.13.0",
- "halo2",
- "hex",
- "jubjub",
- "lazy_static",
- "pasta_curves 0.5.1",
- "rand",
- "serde",
- "sha2",
- "sha3",
- "subtle",
-]
diff --git b/Cargo.toml a/Cargo.toml
index 8a70b3e8..1c638a39 100644
--- b/Cargo.toml
+++ a/Cargo.toml
@@ -11,12 +11,9 @@ members = [
   "recursion/circuit",
   "recursion/compiler",
   "recursion/core",
-<<<<<<< HEAD
   "recursion/core-v2",
-=======
   "recursion/derive",
   "recursion/gnark-cli",
->>>>>>> dev
   "recursion/gnark-ffi",
   "recursion/program",
   "sdk",
@@ -55,6 +52,7 @@ sp1-primitives = { path = "primitives", version = "1.0.0-rc.1" }
 sp1-prover = { path = "prover", version = "1.0.0-rc.1" }
 sp1-recursion-compiler = { path = "recursion/compiler", version = "1.0.0-rc.1" }
 sp1-recursion-core = { path = "recursion/core", version = "1.0.0-rc.1", default-features = false }
+sp1-recursion-core-v2 = { path = "recursion/core-v2", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-derive = { path = "recursion/derive", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-gnark-ffi = { path = "recursion/gnark-ffi", version = "1.0.0-rc.1", default-features = false }
 sp1-recursion-program = { path = "recursion/program", version = "1.0.0-rc.1", default-features = false }
diff --git b/recursion/compiler/Cargo.toml a/recursion/compiler/Cargo.toml
index baa3a83a..15c4d92f 100644
--- b/recursion/compiler/Cargo.toml
+++ a/recursion/compiler/Cargo.toml
@@ -21,18 +21,11 @@ p3-poseidon2 = { workspace = true }
 p3-symmetric = { workspace = true }
 p3-util = { workspace = true }
 
-<<<<<<< HEAD
-sp1-core = { path = "../../core", version = "0.0.2-test" }
-sp1-primitives = { path = "../../primitives", version = "0.0.2-test" }
-sp1-recursion-core = { path = "../core", version = "0.0.2-test" }
-sp1-recursion-core-v2 = { path = "../core-v2", version = "0.0.2-test" }
-sp1-recursion-derive = { path = "../derive", version = "0.0.2-test" }
-=======
 sp1-core = { workspace = true }
 sp1-primitives = { workspace = true }
 sp1-recursion-core = { workspace = true }
+sp1-recursion-core-v2 = { workspace = true }
 sp1-recursion-derive = { workspace = true }
->>>>>>> dev
 
 itertools = "0.13.0"
 serde = { version = "1.0.204", features = ["derive"] }
diff --git b/recursion/core-v2/Cargo.toml a/recursion/core-v2/Cargo.toml
index 80ca19b6..5bb5059d 100644
--- b/recursion/core-v2/Cargo.toml
+++ a/recursion/core-v2/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "sp1-recursion-core-v2"
-version = "0.0.2-test"
-edition = "2021"
 description = "SP1 is a performant, 100% open-source, contributor-friendly zkVM."
 readme = "../../README.md"
-license = "MIT OR Apache-2.0"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
 
 [dependencies]
 p3-field = { workspace = true }
@@ -15,11 +18,11 @@ p3-matrix = { workspace = true }
 p3-maybe-rayon = { workspace = true }
 p3-poseidon2 = { workspace = true }
 p3-symmetric = { workspace = true }
-sp1-derive = { path = "../../derive" }
-sp1-primitives = { path = "../../primitives" }
+sp1-derive = { workspace = true }
+sp1-primitives = { workspace = true }
 tracing = "0.1.40"
-sp1-core = { path = "../../core" }
-sp1-recursion-core = { path = "../core" }
+sp1-core = { workspace = true }
+sp1-recursion-core = { workspace = true }
 hashbrown = { version = "0.14.5", features = ["serde"] }
 itertools = "0.13.0"
 p3-bn254-fr = { workspace = true }
@@ -28,14 +31,14 @@ p3-commit = { workspace = true }
 p3-dft = { workspace = true }
 p3-challenger = { workspace = true }
 p3-fri = { workspace = true }
-p3-uni-stark = { workspace = true }
-zkhash = { git = "https://github.com/HorizenLabs/poseidon2" }
+zkhash = "0.2.0"
 ff = { version = "0.13", features = ["derive", "derive_bits"] }
 serde = { version = "1.0", features = ["derive", "rc"] }
-serde_with = "3.8.1"
+serde_with = "3.9.0"
 backtrace = { version = "0.3.71", features = ["serde"] }
 arrayref = "0.3.7"
 static_assertions = "1.1.0"
+num_cpus = "1.16.0"
 
 [dev-dependencies]
 rand = "0.8.5"

mattstam and others added 26 commits July 12, 2024 15:47
@mattstam
chore: add more context to input stream panic (#1091)
7b74b8b
@ctian1
feat: parallel recursion tracegen (#1095)
f11e51a
@mattstam
chore: remove XDG_CONFIG_HOME from sp1up (#1109)
c8d61a2
@mattstam
ci: use global workspace version (#1102)
23841be
@dependabot
chore(deps): bump clap from 4.5.8 to 4.5.9 (#1107)
08184bd 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump sysinfo from 0.30.12 to 0.30.13 (#1106)
b20de3d 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump cc from 1.0.100 to 1.1.5 (#1104)
1796857 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump async-trait from 0.1.80 to 0.1.81 (#1105)
874d5fd 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps): bump serde_with from 3.8.3 to 3.9.0 (#1103)
90b85a8 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jtguibas
fix: lookup id collisions (#1114)
1d76b09
@tamirhemo
fix: global memory assertions (#1083)
e7d42d1
@tamirhemo
perf: prover utilization (#1100)
33150c1
@jtguibas
fix: incorrect checks on deferred digest (#1116)
eda543c
@kevjue
fix: Allen's Poseidon2 fixes (#1099)
e62e8a1
@ratankaliani
chore: export execution report (#1112)
4591c7a
@tamirhemo
fix: BLS381 decompress (#1121)
1a8509f
@kevjue
perf: poseidon2 parallel tracegen (#1118)
22f51bb
@ratankaliani
fix: sp1-helper workspace build (#1119)
6e92b1b
@jtguibas
feat: multi-threaded tracing (#1124)
b17f86e
@ctian1
fix: memory limit (#1123)
6ec3378
@ctian1
feat: v1.0.0-rc.1 (#1126)
f465819
@mattstam
chore: prepare release v1.0.0-rc.1 (#1127)
8a1d629
@mattstam
chore: organize workspaces (#1129)
5de8269
@ctian1
chore: bump tendermint input block height (#1130)
3bfe5af
@mattstam
chore: add audit reports (#1142)
46ce208
@tqn
Merge branch 'dev' into tqn/merge-dev-into-experimental
7b95b64
@tqn tqn requested a review from jtguibas July 22, 2024 18:05
@tqn tqn merged commit bc7219e into experimental Jul 22, 2024
7 of 10 checks passed
@tqn tqn deleted the tqn/merge-dev-into-experimental branch July 22, 2024 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtguibas jtguibas jtguibas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tqn @jtguibas @mattstam @ctian1 @tamirhemo @kevjue @ratankaliani